Skip to content

O
Opple-iOS
Commit d00d4dc3 authored by 曹云霄's avatar 曹云霄
Browse files
Options

no message

parent 26e566d7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 175 additions and 35 deletions
Class/LearningCenter/ComprehensiveDiscussion/Cells/CommentListTableViewCell.h
View file @ d00d4dc3
......@@ -20,7 +20,7 @@
/**
评论人姓名
*/
@property (weak, nonatomic) IBOutlet UILabel *issuerNameLabel;
@property (weak, nonatomic) IBOutlet CustomBorderLabel *issuerNameLabel;
/**
评论时间
......
Class/LearningCenter/ComprehensiveDiscussion/Cells/CommentListTableViewCell.m
View file @ d00d4dc3
......@@ -87,8 +87,13 @@
{
_replyEntity = replyEntity;
self.bestView.replyId = _replyEntity.fid;
[self.issuerImageView sd_setImageWithURL:[NSURL URLWithString:_replyEntity.replyerPicture] placeholderImage:ReplaceImage];
self.issuerNameLabel.text = [NSString stringWithFormat:@"%@: %@",_replyEntity.replyerPosition,_replyEntity.replyerRealName];
if (_replyEntity.isAdminReply) {
self.issuerNameLabel.customText = @"管理员";
self.issuerImageView.image = [UIImage imageNamed:@"manager"];
}else {
self.issuerNameLabel.customText = [NSString stringWithFormat:@"%@: %@",_replyEntity.replyerPosition,_replyEntity.replyerRealName];
[self.issuerImageView sd_setImageWithURL:[NSURL URLWithString:_replyEntity.replyerPicture] placeholderImage:ReplaceImage];
}
self.issuerDateLabel.text = [BaseViewController formateDate:_replyEntity.replyTime];
self.commentContentLabel.text = _replyEntity.replyContent;
self.bestView.isBest = _replyEntity.best;
......@@ -105,6 +110,7 @@
UIImageView *imgView = (UIImageView *)[self.attachmentView viewWithTag:i];
[imgView sd_setImageWithURL:[NSURL URLWithString:att.fileUrl] placeholderImage:REPLACEIMAGE];
}
}
#pragma mark - lazy
......
Class/LearningCenter/ComprehensiveDiscussion/Cells/ForumTableViewCell.h
View file @ d00d4dc3
......@@ -16,6 +16,11 @@
*/
@property (weak, nonatomic) IBOutlet UIImageView *forumImageView;
/**
未读背景
*/
@property (weak, nonatomic) IBOutlet UIView *remindBgView;
/**
icon
*/
......
Class/LearningCenter/ComprehensiveDiscussion/Cells/ForumTableViewCell.m
View file @ d00d4dc3
......@@ -23,6 +23,8 @@
[self.iconImageView sd_setImageWithURL:[NSURL URLWithString:_categoryEntity.attachment.fileUrl] placeholderImage:nil];
self.forumTitleLabel.text = _categoryEntity.name;
self.forumDetailTitleLabel.text = _categoryEntity.fdescription;
//判断是否显示未读提醒
self.remindBgView.hidden = !categoryEntity.hasNew;
}
}
......
Class/LearningCenter/ComprehensiveDiscussion/Controllers/DiscussModuleViewController.m
View file @ d00d4dc3
......@@ -17,11 +17,14 @@
@implementation DiscussModuleViewController
- (void)viewDidAppear:(BOOL)animated {
[super viewDidAppear:animated];
[self getClassificationList];
}
- (void)viewDidLoad {
[super viewDidLoad];
[self uiConfigAction];
[self getClassificationList];
}
#pragma mark - 获取分类帖子列表
......@@ -29,7 +32,7 @@
{
[XBLoadingView showHUDViewWithDefaultWithView:self.view];
WS(weakSelf);
[HTTP networkWithDictionaryRequestWithURL:SERVERREQUESTURL(DEFAULTFORUM_CATEGORY) withRequestType:GET withParameter:nil withReturnValueBlock:^(id returnValue) {
[HTTP networkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(DEFAULTFORUM_CATEGORY),[Shoppersmanager manager].shoppers.employee.fid] withRequestType:GET withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefaultWithView:self.view];
if (RESULT(returnValue)) {
......
Class/LearningCenter/ComprehensiveDiscussion/Controllers/ForumItemDetailViewController.m
View file @ d00d4dc3
......@@ -382,6 +382,7 @@
reply.replyerPosition = [Shoppersmanager manager].shoppers.employee.positionsName;
reply.replyTime = [[self class] getTimeby:0];
reply.replyerId = [Shoppersmanager manager].shoppers.employee.fid;
reply.isAdminReply = [Shoppersmanager manager].shoppers.isAdmin;
NSMutableArray *attachments = [NSMutableArray array];
NSString *entityId = [OSSHelper getOSSObjectKey];
reply.attachmentId = entityId;
......@@ -396,9 +397,6 @@
reply.attachments = (NSArray<TOAttachmentEntity>*)attachments;
[weakSelf httpSubmit:reply complete:nil];
}];
}
- (void)httpSubmit:(TOForumReplyEntity *)reply complete:(void (^)(void))complete {
......
Class/LearningCenter/ComprehensiveDiscussion/Controllers/ForumItemListViewController.m
View file @ d00d4dc3
......@@ -145,6 +145,22 @@ static NSString *TAGCELL_IDENTIFIER = @"CommentTagTableViewCell";
}];
}
#pragma mark - 读帖
- (void)readTopic:(NSString *)forumTopicId finish:(void(^)())block {
[XBLoadingView showHUDViewWithDefault];
[HTTP networkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(READTOPIC),forumTopicId,[Shoppersmanager manager].shoppers.employee.fid] withRequestType:POST withParameter:nil withReturnValueBlock:^(id returnValue) {
if (RESULT(returnValue)) {
if (block) {
block();
}
}else {
[XBLoadingView showHUDViewWithText:MESSAGE(returnValue)];
}
} withFailureBlock:^(NSError *error) {
[XBLoadingView showHUDViewWithText:error.localizedDescription];
}];
}
#pragma mark - 发帖
- (IBAction)releaseButtonClickAction:(UIButton *)sender {
......@@ -160,9 +176,7 @@ static NSString *TAGCELL_IDENTIFIER = @"CommentTagTableViewCell";
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
CustomTOForumTopicEntity *entity = self.datasArray[indexPath.row];
if (entity.backEnd ||
entity.bestTopic ||
![[self class] isBlankString:entity.top]) {
if (entity.backEnd || entity.bestTopic || ![[self class] isBlankString:entity.top]) {
CommentTagTableViewCell *tagCell = [tableView dequeueReusableCellWithIdentifier:TAGCELL_IDENTIFIER forIndexPath:indexPath];
[self configTagCellAction:tagCell withIndexPath:indexPath];
return tagCell;
......@@ -230,7 +244,9 @@ static NSString *TAGCELL_IDENTIFIER = @"CommentTagTableViewCell";
}
}
}];
[self.navigationController pushViewController:postDetail animated:YES];
[self readTopic:entity.fid finish:^{
[weakSelf.navigationController pushViewController:postDetail animated:YES];
}];
}
#pragma mark -设置普通帖子
......
Class/LearningCenter/ComprehensiveDiscussion/Controllers/ForumViewController.m
View file @ d00d4dc3
......@@ -20,6 +20,11 @@
@implementation ForumViewController
- (void)viewDidAppear:(BOOL)animated {
[super viewDidAppear:animated];
[self getForumAllTypeAction];
}
- (void)viewDidLoad {
[super viewDidLoad];
......@@ -59,7 +64,7 @@
{
WS(weakSelf);
[XBLoadingView showHUDViewWithDefault];;
[HTTP networkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(FORUMCATEGORYS),self.typeId] withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
[HTTP networkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(FORUMCATEGORYS),self.typeId,[Shoppersmanager manager].shoppers.employee.fid] withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault];
[weakSelf endRefreshingForTableView:weakSelf.forumTableView];
......
Class/LearningCenter/ComprehensiveDiscussion/Controllers/ReleasePostViewController.m
View file @ d00d4dc3
......@@ -224,7 +224,6 @@
- (void)showCameraAction
{
if ([[self class] determineCameraPermissions]) {
UIImagePickerController *camera = [[UIImagePickerController alloc]init];
camera.delegate = self;
if ([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) {
......@@ -235,9 +234,7 @@
[XBLoadingView showHUDViewWithText:@"相机无法使用"];
}
}else {
UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"提示" message:@"请在iPad的“设置-隐私-相机”选项中，允许欧立方访问你的相机" preferredStyle:UIAlertControllerStyleAlert];
[alertVC addAction:[UIAlertAction actionWithTitle:@"知道了" style:UIAlertActionStyleCancel handler:nil]];
[self presentViewController:alertVC animated:YES completion:nil];
ShowAlertView(@"提示", @"请在iPad的“设置-隐私-相机”选项中，允许欧立方访问你的相机", nil, @"知道了", UIAlertControllerStyleAlert, nil, nil);
}
}
......@@ -436,7 +433,7 @@
topic.posterPicture = [Shoppersmanager manager].shoppers.employee.picture;
topic.postTime = [[self class] getTimeby:0];
topic.category = self.category.fid;
topic.backEnd = NO;
topic.backEnd = [Shoppersmanager manager].shoppers.isAdmin;
topic.forumType = self.category.typeId;
topic.title = title;
topic.content = content;
......
Class/LearningCenter/ComprehensiveDiscussion/Views/DiscussModuleCollectionViewCell.h
View file @ d00d4dc3
......@@ -12,6 +12,11 @@
/**
提醒
*/
@property (weak, nonatomic) IBOutlet UIImageView *remindImageView;
/**
背景图片
*/
......
Class/LearningCenter/ComprehensiveDiscussion/Views/DiscussModuleCollectionViewCell.m
View file @ d00d4dc3
......@@ -15,7 +15,8 @@
[self.discussModuleImageView sd_setImageWithURL:[NSURL URLWithString:entity.attachmentBg.fileUrl] placeholderImage:REPLACEIMAGE];
[self.iconImageView sd_setImageWithURL:[NSURL URLWithString:entity.attachment.fileUrl] placeholderImage:REPLACEIMAGE];
self.titleLabel.text = entity.name;
//判断是否显示未读提醒
self.remindImageView.hidden = !entity.hasNew;
}
@end
Class/MyClient/Orderdetails/controller/SettlementViewController.m
View file @ d00d4dc3
......@@ -108,12 +108,12 @@
//微信卡劵
if ([model isMemberOfClass:[PromotionWeChatCardModel class]]) {
PromotionWeChatCardModel *weChatModel = (PromotionWeChatCardModel *)model;
weChatPrice = @{@"price":[NSString stringWithFormat:@"%ld",self.weChatModel.wxcardDenomation],@"priority":@(weChatModel.priority)};
weChatPrice = @{@"price":[NSString stringWithFormat:@"%f",self.weChatModel.wxcardDenomation],@"priority":@(weChatModel.priority)};
}else if ([model isMemberOfClass:[PromotionalDeductionModel class]]) {
//抵扣
PromotionalDeductionModel *deductionModel = (PromotionalDeductionModel *)model;
deductionPrice = @{@"price":[NSString stringWithFormat:@"%ld",deductionModel.total],@"priority":@(deductionModel.priority)};
deductionPrice = @{@"price":[NSString stringWithFormat:@"%f",deductionModel.total],@"priority":@(deductionModel.priority)};
}else if ([model isMemberOfClass:[PromotionLuckyDrawModel class]]) {
//抽奖
......
Class/RIghtVC/ProductLibraryVC/controller/ProductLibraryViewController.m
View file @ d00d4dc3
......@@ -264,8 +264,8 @@
{
//价格字符串切割
NSArray *spacrArray = [weakSelf.selectedCode componentsSeparatedByString:@"到"];
weakSelf.condtionModel.startprice = (NSDecimalNumber *)[NSDecimalNumber numberWithInteger:[[spacrArray objectAtIndex_opple:0] integerValue]];
weakSelf.condtionModel.endprice = (NSDecimalNumber *)[NSDecimalNumber numberWithInteger:[[spacrArray objectAtIndex_opple:1] integerValue]];
weakSelf.condtionModel.startprice = [NSNumber numberWithInteger:[[spacrArray objectAtIndex_opple:0] integerValue]];
weakSelf.condtionModel.endprice = [NSNumber numberWithInteger:[[spacrArray objectAtIndex_opple:1] integerValue]];
}
break;
default:
......
Class/Tabbar/CustomTabbar/CustomTabbarController.m
View file @ d00d4dc3
......@@ -328,11 +328,31 @@
#pragma mark -推出3D体验中心控制器
- (void)show3DFollowHeart:(NSNotification *)objc
{
MyclientEntityModel *user = [Customermanager manager].model;
if (user == nil) {
ShowAlertView(nil, @"请先指定当前客户", nil, @"我知道了", UIAlertControllerStyleAlert, nil, nil);
return;
}
LoginResult *shopper = [Shoppersmanager manager].shoppers;
CustomWKWebViewController *webView = [[CustomWKWebViewController alloc] init];
webView.type = Announcement;
webView.urlString = @"http://ysj.zbj.com/oem/100001.html";
webView.urlString = [NSString stringWithFormat:BAJIE3D,user.fid,shopper.employee.departid,shopper.employee.fid];
[self presentViewController:webView animated:YES completion:nil];
}
@end
Lighting/LearningCenter.storyboard
View file @ d00d4dc3
This diff is collapsed.
Lighting/Supporting Files/Images.xcassets/NewRed.imageset/Contents.json 0 → 100644
View file @ d00d4dc3
{
"images" : [
{
"idiom" : "universal",
"filename" : "NewRed.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "NewRed@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "NewRed@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Lighting/Supporting Files/Info.plist
View file @ d00d4dc3
......@@ -15,7 +15,7 @@
<key>CFBundleName</key>
<string>欧立方</string>
<key>CFBundleShortVersionString</key>
<string>2.1.3</string>
<string>2.1.6</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
......@@ -48,7 +48,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>2.1.3</string>
<string>2.1.6</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>wechat</string>
......
Tools/CYConst/CYConstManager.h
View file @ d00d4dc3
......@@ -57,6 +57,7 @@
#import "YXAlertController.h"
#import "UIView+Frame.h"
#import "UIImage+Fit.h"
#import "WZLBadgeImport.h"
#import <UMSocialCore/UMSocialCore.h>
// 引入JPush功能所需头文件
#import "JPUSHService.h"
......@@ -116,6 +117,12 @@ typedef NS_ENUM(NSInteger,COMMENT_PRAISE) {
/*****************************************接口地址*****************************************/
/**
* 猪八戒3D
*/
extern NSString *const BAJIE3D;
/**
* 登陆
*/
......@@ -603,6 +610,11 @@ extern NSString *const READPACKETPATH;
* 保存门店地区
*/
extern NSString *const ADDRESS;
/**
* 读帖
*/
extern NSString *const READTOPIC;
/*****************************************接口地址*****************************************/
......
Tools/CYConst/CYConstManager.m
View file @ d00d4dc3
......@@ -12,6 +12,12 @@
/*****************************************接口地址*****************************************/
/**
* 猪八戒3D
*/
NSString *const BAJIE3D = @"http://ysj.zbj.com/oem/100001.html?consumerId=%@&resellerId=%@&uId=%@&key=9efb9f0537d24caca3c30fe7b9aeb0af";
/**
* 登陆
*/
......@@ -342,7 +348,7 @@ NSString *const STUDYTYPES = @"/study/getTypes";
/**
* 论坛讨论项分类第二层
*/
NSString *const FORUMCATEGORYS = @"/forum/getCategorys/%@";
NSString *const FORUMCATEGORYS = @"/forum/getCategorys/%@/%@";
/**
* 论坛讨类型第一层
*/
......@@ -485,7 +491,7 @@ NSString *const GETTIMELINE = @"/forum/getTimeLine";
/**
* 综合讨论区
*/
NSString *const DEFAULTFORUM_CATEGORY = @"/forum/getDefaultForumCategory";
NSString *const DEFAULTFORUM_CATEGORY = @"/forum/getDefaultForumCategory/%@";
/**
* 查询红包
*/
......@@ -498,6 +504,10 @@ NSString *const READPACKETPATH = @"/redPackage/uploadNote?orderNumber=%@&orderR
* 保存门店地区
*/
NSString *const ADDRESS = @"/resellerStore/saveStoreAddress";
/**
* 读帖
*/
NSString *const READTOPIC = @"/forum/readForumTopic/%@/%@";
/*****************************************接口地址*****************************************/
/**
......
Tools/Jastor/opple_objc_json_client.h
View file @ d00d4dc3
......@@ -793,6 +793,11 @@ extern NSString * const GRADEMETHOD_MANUL;
*
*/
@property (nonatomic, assign) BOOL isHasStoreAddress;
/**
是否是管理员
*/
@property (nonatomic,assign) BOOL isAdmin;
@end /* interface LoginResult */
......@@ -2121,7 +2126,10 @@ extern NSString * const GRADEMETHOD_MANUL;
*/
@property (nonatomic,copy) NSString *typeId;
//帖子数量
@property (nonatomic, assign) NSInteger topicCount;
//是否有最新的帖子
@property (nonatomic,assign) BOOL hasNew;
/**
* 附件
*
......@@ -5823,6 +5831,11 @@ extern NSString * const GRADEMETHOD_MANUL;
*
*/
@property (nonatomic, copy) NSString *replyerPicture;
/**
是否是管理员
*/
@property (nonatomic,assign) BOOL isAdminReply;
@end /* interface TOForumReplyEntity */
......
Tools/NetworkRequest/NetworkRequestClassManager.m
View file @ d00d4dc3
......@@ -158,6 +158,7 @@ static NetworkRequestClassManager *manager = nil;
withReturnValueBlock:(ReturnValueBlock) successBlock
withFailureBlock:(FailureBlock) failureBlock
{
NSLog(@"%@",requestURLString);
AFHTTPSessionManager *manager = [self baseHttpRequest];
if (requestType == POST) {
[manager POST:requestURLString parameters:parameter progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment