Skip to content

D
Dolphins
Commit 84ff71f8 authored by zhangguangyi's avatar zhangguangyi
Browse files
Options

update

parent afc3e80d
Hide whitespace changes
Inline Side-by-side
Showing with 214 additions and 21 deletions
Dolphins.xcodeproj/project.pbxproj
View file @ 84ff71f8
......@@ -1472,13 +1472,13 @@
isa = PBXGroup;
children = (
BFCEA59824D115950010B2F0 /* GYEmptyBaseView.h */,
BFCEA59924D115950010B2F0 /* UIScrollView+GYEmpty.h */,
BFCEA59A24D115950010B2F0 /* UIView+GYView.h */,
BFCEA59B24D115950010B2F0 /* GYEmptyView.m */,
BFCEA59C24D115950010B2F0 /* GYEmptyBaseView.m */,
BFCEA59924D115950010B2F0 /* UIScrollView+GYEmpty.h */,
BFCEA59D24D115950010B2F0 /* UIScrollView+GYEmpty.m */,
BFCEA59E24D115950010B2F0 /* UIView+GYView.m */,
BFCEA59F24D115950010B2F0 /* GYEmptyView.h */,
BFCEA59B24D115950010B2F0 /* GYEmptyView.m */,
BFCEA59A24D115950010B2F0 /* UIView+GYView.h */,
BFCEA59E24D115950010B2F0 /* UIView+GYView.m */,
);
path = GYEmptyView;
sourceTree = "<group>";
......
Dolphins.xcodeproj/xcuserdata/zhangguangyi.xcuserdatad/xcschemes/xcschememanagement.plist 0 → 100644
View file @ 84ff71f8
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>Dolphins.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
</dict>
</plist>
Dolphins/Classes/Guard/Controller/ZJGuardViewController.m
View file @ 84ff71f8
......@@ -32,21 +32,16 @@
- (void)viewWillAppear:(BOOL)animated{
[super viewWillAppear:animated];
[self.navigationController setNavigationBarHidden:YES animated:YES];
[self requestRemindList];
}
- (void)viewDidLoad {
[super viewDidLoad];
_dataSource = [[NSMutableArray alloc] init];
// _dataSource = @[@{@"title":@"多吃蔬菜", @"image":@"remind_cell_2_3"},
// @{@"title":@"记得起床", @"image":@"remind_cell_3_2"},
// @{@"title":@"多吃水果", @"image":@"remind_cell_2_0"},
// @{@"title":@"多喝水", @"image":@"remind_cell_0_2"},
// @{@"title":@"添加提醒", @"image":@"remind_cell_Add"}].mutableCopy;
[self setUI];
[self getFriendList];
[self requestRemindList];
}
- (void)setUI{
......
Dolphins/Classes/Reminder/Controller/ZJAddReminderController.m
View file @ 84ff71f8
......@@ -41,17 +41,16 @@
}
NSDictionary *dict = @{@"iconId":@(self.chooseModel.id),@"name":self.textField.text};
// dict[@"remindTypeInsert"] = @{@"iconId":@(self.chooseModel.id),@"name":self.textField.text};
[MBProgressHUD showHUD:@"" view:self.view];
[[TQNetworkTools shared] postWithBodyAction:reminderAddRemindType parameters:@{} body:dict success:^(NSDictionary * _Nonnull response) {
if ([response[@"status"] intValue] == 200) {
[self.navigationController popViewControllerAnimated:YES];
}else{
[MBProgressHUD showMessage:@"服务出错，请稍后重试!"];
}
[MBProgressHUD hideHUDForView:self.view];
} failure:^(NSError * _Nonnull error) {
[MBProgressHUD hideHUDForView:self.view];
}];
}
......
Dolphins/Classes/Reminder/Controller/ZJReminderCareController.m
View file @ 84ff71f8
......@@ -9,6 +9,8 @@
#import "ZJReminderCareController.h"
#import "ZJReminderCareCell.h"
#import "ZJFriendModel.h"
#import "GYEmptyView.h"
#import "UIScrollView+GYEmpty.h"
static NSString * const ZJReminderCareCellID = @"ZJReminderCareCellID";
@interface ZJReminderCareController ()<UITableViewDataSource,UITableViewDelegate>
......@@ -49,12 +51,17 @@ static NSString * const ZJReminderCareCellID = @"ZJReminderCareCellID";
make.bottom.mas_equalTo(0);
}];
self.tableView.gy_emptyView = [GYEmptyView emptyViewWithImageStr:@"mine_emergency_contact_without"
titleStr:@" "
detailStr:@"您的好友列表没有人哦~"];
self.tableView.gy_emptyView.autoShowEmptyView = NO;
}
-(void)requestData
{
[self.dataArray removeAllObjects];
[[TQNetworkTools shared] getWithAction:findFriendList parameters:@{} success:^(id _Nonnull response) {
self.tableView.gy_emptyView.autoShowEmptyView = YES;
if([[response objectForKey:@"status"] integerValue] == 200){
if ([response[@"result"][@"data"] isKindOfClass:[NSArray class]]) {
for (NSDictionary *dict in response[@"result"][@"data"]) {
......@@ -65,7 +72,6 @@ static NSString * const ZJReminderCareCellID = @"ZJReminderCareCellID";
}else{
[MBProgressHUD showError:[NSString stringWithFormat:@"%@", [response objectForKey:@"msg"]] toView:self.view];
}
[self.tableView reloadData];
} failure:^(NSError * _Nonnull error) {
......
Dolphins/Classes/Reminder/Controller/ZJReminderMainController.m
View file @ 84ff71f8
......@@ -11,6 +11,8 @@
#import "ZJReminderBottom.h"
#import "ZJReminder.h"
#import "ZJReminderCateAddController.h"
#import "GYEmptyView.h"
#import "UIScrollView+GYEmpty.h"
static NSString *ZJReminderMainCellID = @"ZJReminderMainCellID";
@interface ZJReminderMainController ()<UITableViewDataSource,UITableViewDelegate>
......@@ -56,7 +58,6 @@ static NSString *ZJReminderMainCellID = @"ZJReminderMainCellID";
-(void)setupUI
{
self.view.backgroundColor = [UIColor colorWithHexString:@"FAFAFA"];
[self.view addSubview:self.tableView];
[self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(0);
......@@ -65,6 +66,11 @@ static NSString *ZJReminderMainCellID = @"ZJReminderMainCellID";
make.bottom.mas_equalTo(0);
}];
self.tableView.gy_emptyView = [GYEmptyView emptyViewWithImageStr:@"LocationHint_bg"
titleStr:@" "
detailStr:@"暂时还没有设置提醒呢,去添加一个吧~"];
self.tableView.gy_emptyView.autoShowEmptyView = NO;
self.bottomView = [[ZJReminderBottom alloc] init];
[self.view addSubview:self.bottomView];
[self.bottomView mas_makeConstraints:^(MASConstraintMaker *make) {
......@@ -81,6 +87,7 @@ static NSString *ZJReminderMainCellID = @"ZJReminderMainCellID";
if (weakSelf.isManger) {
NSLog(@"删除整个分类");
[weakSelf deleteCategory];
}else{
NSLog(@"添加提醒");
ZJReminderCateAddController *vc = [ZJReminderCateAddController new];
......@@ -90,6 +97,31 @@ static NSString *ZJReminderMainCellID = @"ZJReminderMainCellID";
};
}
-(void)deleteCategory
{
if (self.model == nil) return;
NSDictionary *dict = @{@"locationRemindId":@(self.model.id)};
[[TQNetworkTools shared] postWithAction:reminderDeleteAllReminder parameters:dict success:^(id _Nonnull response) {
if ([response[@"status"] intValue] == 200) {
[self.navigationController popViewControllerAnimated:YES];
}else{
[MBProgressHUD showMessage:response[@"msg"]];
}
} failure:^(NSError * _Nonnull error) {
}];
// NSDictionary *dict = @{@"remindTypeId":@(self.model.id)};
// [[TQNetworkTools shared] postWithAction:reminderDeleteCategory parameters:dict success:^(id _Nonnull response) {
// if ([response[@"status"] intValue] == 200) {
// [self.navigationController popViewControllerAnimated:YES];
// }else{
// [MBProgressHUD showMessage:response[@"msg"]];
// }
// } failure:^(NSError * _Nonnull error) {
//
// }];
}
-(void)chooseAction
{
NSString *name = self.navigationItem.rightBarButtonItem.title;
......@@ -123,6 +155,7 @@ static NSString *ZJReminderMainCellID = @"ZJReminderMainCellID";
{
if (self.model == nil) return;
[[TQNetworkTools shared] getWithAction:userRemindInfo parameters:@{@"typeId":@(self.model.id)} success:^(id _Nonnull response) {
self.tableView.gy_emptyView.autoShowEmptyView = YES;
if([response[@"status"] integerValue] == 200){
[self.dataArray removeAllObjects];
if ([response[@"result"][@"data"] isKindOfClass:[NSArray class]]) {
......@@ -164,9 +197,14 @@ static NSString *ZJReminderMainCellID = @"ZJReminderMainCellID";
-(void)deleteAction:(UIButton *)sender
{
ZJReminderMainCell *cell = (ZJReminderMainCell *)sender.superview.superview;
NSIndexPath *indexPath = [self.tableView indexPathForCell:cell];
ZJReminder *model = self.dataArray[indexPath.row];
UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"温馨提示" message:@"删除后，好友将收不到此分类下的所有提醒通知，确定要删除吗?" preferredStyle:UIAlertControllerStyleAlert];
UIAlertAction *cancel = [UIAlertAction actionWithTitle:@"在想想" style:UIAlertActionStyleCancel handler:nil];
UIAlertAction *delete = [UIAlertAction actionWithTitle:@"删除" style:UIAlertActionStyleDestructive handler:nil];
UIAlertAction *delete = [UIAlertAction actionWithTitle:@"删除" style:UIAlertActionStyleDestructive handler:^(UIAlertAction * _Nonnull action) {
[self deleteReminder:model];
}];
[alert addAction:cancel];
[alert addAction:delete];
......@@ -174,6 +212,21 @@ static NSString *ZJReminderMainCellID = @"ZJReminderMainCellID";
}
-(void)deleteReminder:(ZJReminder *)model
{
NSDictionary *dict = @{@"locationRemindId":@(model.id)};
[[TQNetworkTools shared] postWithAction:reminderDeleteReminder parameters:dict success:^(id _Nonnull response) {
if ([response[@"status"] intValue] == 200) {
[MBProgressHUD showMessage:@"删除成功"];
[self requestData];
}
} failure:^(NSError * _Nonnull error) {
}];
}
-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
[tableView deselectRowAtIndexPath:indexPath animated:YES];
......
Dolphins/Classes/Reminder/Others/GYEmptyView/GYEmptyView.m
View file @ 84ff71f8
......@@ -124,7 +124,7 @@
//重新设置self的frame（大小为content的大小）
self.size = CGSizeMake(contentWidth, contentHeight);
CGFloat emptyViewCenterX = scrollViewWidth * 0.5f;
CGFloat emptyViewCenterY = scrollViewHeight * 0.5f;
CGFloat emptyViewCenterY = scrollViewHeight * 0.3f;
self.center = CGPointMake(emptyViewCenterX, emptyViewCenterY);
//设置contentView
......
Dolphins/Classes/Reminder/View/ZJReminderCareCell.xib
View file @ 84ff71f8
......@@ -28,6 +28,12 @@
<constraint firstAttribute="width" constant="40" id="3z7-Gr-4on"/>
<constraint firstAttribute="height" constant="40" id="D9t-Xg-lRp"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="clipsToBounds" value="YES"/>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="20"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jmb-kr-BOC">
<rect key="frame" x="75" y="0.0" width="256" height="74"/>
......
Dolphins/Classes/Tools/Network/TQNetworkTools.h
View file @ 84ff71f8
......@@ -48,7 +48,7 @@ typedef enum : NSUInteger {
addFriendHintStyle, //用户注销
userRemindInfo, //用户提醒列表信息 typeId = 1 电量
reminderIconList, // 图标列表
reminderTypeList
reminderTypeList, // 提醒类型列表
} TQNetwortGetAction;
......@@ -96,7 +96,10 @@ typedef enum : NSUInteger {
logCollection, //埋点
userRemindInfoSet, //上报用户提醒信息
reminderAddRemindType // 添加提醒类型
reminderAddRemindType, // 添加提醒类型
reminderDeleteReminder, // 删除提醒
reminderDeleteCategory, // 删除分类
reminderDeleteAllReminder, // 删除所有提醒和分类
} TQNetwortPostAction;
......
Dolphins/Classes/Tools/Network/TQNetworkTools.m
View file @ 84ff71f8
......@@ -407,6 +407,14 @@ static TQNetworkTools* _tools = nil;
return @"/app/v1/location/remind/remind";
case reminderAddRemindType:
return @"/app/v1/location/remind/add-remind-type";
case reminderDeleteReminder:
return @"/app/v1/location/remind/delete-remind";
case reminderDeleteCategory:
return @"/app/v1/location/remind/delete-reType";
case reminderDeleteAllReminder:
return @"/app/v1/location/remind/delete-all-remind";
default:
return @"";
}
......
Pods/Pods.xcodeproj/xcuserdata/zhangguangyi.xcuserdatad/xcschemes/xcschememanagement.plist 0 → 100644
View file @ 84ff71f8
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>AFNetworking.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
</dict>
<key>AMap3DMap.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>2</integer>
</dict>
<key>AMapFoundation.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>3</integer>
</dict>
<key>AMapLocation.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>4</integer>
</dict>
<key>AMapSearch.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>5</integer>
</dict>
<key>Bugly.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>6</integer>
</dict>
<key>CL_ShanYanSDK.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>7</integer>
</dict>
<key>GTSDK.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>8</integer>
</dict>
<key>IQKeyboardManager.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>9</integer>
</dict>
<key>MBProgressHUD.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>11</integer>
</dict>
<key>MJExtension.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>12</integer>
</dict>
<key>MJRefresh.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>13</integer>
</dict>
<key>Masonry.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>10</integer>
</dict>
<key>Pods-Dolphins.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>14</integer>
</dict>
<key>RTRootNavigationController.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>15</integer>
</dict>
<key>SDCycleScrollView.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>16</integer>
</dict>
<key>SDWebImage.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>17</integer>
</dict>
<key>SwiftyStoreKit.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>18</integer>
</dict>
<key>UMCCommon.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>19</integer>
</dict>
<key>YYModel.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>20</integer>
</dict>
</dict>
</dict>
</plist>
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