Skip to content

D
Dolphins
Commit 4ef993ad authored by lmj_521aiau@163.com's avatar lmj_521aiau@163.com
Browse files
Options

no message

parent f9e1d840
Hide whitespace changes
Inline Side-by-side
Showing with 270 additions and 46 deletions
.DS_Store
View file @ 4ef993ad
No preview for this file type
Dolphins.xcodeproj/project.pbxproj
View file @ 4ef993ad
......@@ -16,6 +16,9 @@
A95F5CBE248F2506001DB97E /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A95F5CBD248F2506001DB97E /* CoreTelephony.framework */; };
A95F5CC0248F6D25001DB97E /* libc++.1.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A95F5CBF248F6D25001DB97E /* libc++.1.tbd */; };
A967939A24D14BDA00B6C5FA /* ZJElectricalModel.m in Sources */ = {isa = PBXBuildFile; fileRef = A967939924D14BDA00B6C5FA /* ZJElectricalModel.m */; };
A967939B24D1AE7700B6C5FA /* ZJXiaoXiViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2B8D124D039B400010EAE /* ZJXiaoXiViewController.m */; };
A967939F24D1C46E00B6C5FA /* ZJSystemMessageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A967939D24D1C46E00B6C5FA /* ZJSystemMessageCell.m */; };
A96793A024D1C46E00B6C5FA /* ZJSystemMessageCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A967939E24D1C46E00B6C5FA /* ZJSystemMessageCell.xib */; };
A9764A522490EAC600463B78 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9764A512490EAC600463B78 /* CoreGraphics.framework */; };
A9C2B99D24D039B400010EAE /* launch1@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9C2B84424D039B300010EAE /* launch1@3x.png */; };
A9C2B99E24D039B400010EAE /* launch1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9C2B84624D039B300010EAE /* launch1@2x.png */; };
......@@ -72,7 +75,6 @@
A9C2B9D424D039B500010EAE /* MBProgressHUD+MJ.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2B8C724D039B400010EAE /* MBProgressHUD+MJ.m */; };
A9C2B9D524D039B500010EAE /* MBProgressHUD.bundle in Resources */ = {isa = PBXBuildFile; fileRef = A9C2B8C924D039B400010EAE /* MBProgressHUD.bundle */; };
A9C2B9D624D039B500010EAE /* ZJZMFAPIFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2B8CB24D039B400010EAE /* ZJZMFAPIFactory.m */; };
A9C2B9D724D039B500010EAE /* ZJXiaoXiViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2B8D124D039B400010EAE /* ZJXiaoXiViewController.m */; };
A9C2B9D824D039B500010EAE /* ZJCareViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2B8D224D039B400010EAE /* ZJCareViewController.m */; };
A9C2B9D924D039B500010EAE /* ZJTianJiaViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2B8D424D039B400010EAE /* ZJTianJiaViewController.m */; };
A9C2B9DA24D039B500010EAE /* ZJJinJiViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2B8D624D039B400010EAE /* ZJJinJiViewController.m */; };
......@@ -231,6 +233,9 @@
A95F5CBF248F6D25001DB97E /* libc++.1.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.1.tbd"; path = "usr/lib/libc++.1.tbd"; sourceTree = SDKROOT; };
A967939824D14BDA00B6C5FA /* ZJElectricalModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZJElectricalModel.h; sourceTree = "<group>"; };
A967939924D14BDA00B6C5FA /* ZJElectricalModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZJElectricalModel.m; sourceTree = "<group>"; };
A967939C24D1C46E00B6C5FA /* ZJSystemMessageCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZJSystemMessageCell.h; sourceTree = "<group>"; };
A967939D24D1C46E00B6C5FA /* ZJSystemMessageCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZJSystemMessageCell.m; sourceTree = "<group>"; };
A967939E24D1C46E00B6C5FA /* ZJSystemMessageCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ZJSystemMessageCell.xib; sourceTree = "<group>"; };
A9764A512490EAC600463B78 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
A9C2B84424D039B300010EAE /* launch1@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "launch1@3x.png"; sourceTree = "<group>"; };
A9C2B84524D039B300010EAE /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
......@@ -1004,20 +1009,23 @@
A9C2B8E024D039B400010EAE /* View */ = {
isa = PBXGroup;
children = (
A9C2B8E124D039B400010EAE /* ZJFriendSettingView.m */,
A9C2B8E224D039B400010EAE /* ZJXiaoxiView.h */,
A9C2B8E324D039B400010EAE /* ZJTianJiaView.m */,
A9C2B8E424D039B400010EAE /* ZJSheZhiView.h */,
A9C2B8E524D039B400010EAE /* ZJXiaoXiTableViewCell.h */,
A9C2B8E624D039B400010EAE /* ZJUpgradeAlertView.h */,
A9C2B8E724D039B400010EAE /* ZJTableViewCell.m */,
A9C2B8E824D039B400010EAE /* ZJTianJiaView.h */,
A9C2B8E924D039B400010EAE /* ZJXiaoxiView.m */,
A9C2B8E524D039B400010EAE /* ZJXiaoXiTableViewCell.h */,
A9C2B8EC24D039B400010EAE /* ZJXiaoXiTableViewCell.m */,
A967939C24D1C46E00B6C5FA /* ZJSystemMessageCell.h */,
A967939D24D1C46E00B6C5FA /* ZJSystemMessageCell.m */,
A967939E24D1C46E00B6C5FA /* ZJSystemMessageCell.xib */,
A9C2B8EA24D039B400010EAE /* ZJFriendSettingView.h */,
A9C2B8E124D039B400010EAE /* ZJFriendSettingView.m */,
A9C2B8E424D039B400010EAE /* ZJSheZhiView.h */,
A9C2B8EB24D039B400010EAE /* ZJSheZhiView.m */,
A9C2B8EC24D039B400010EAE /* ZJXiaoXiTableViewCell.m */,
A9C2B8ED24D039B400010EAE /* ZJTableViewCell.h */,
A9C2B8E824D039B400010EAE /* ZJTianJiaView.h */,
A9C2B8E324D039B400010EAE /* ZJTianJiaView.m */,
A9C2B8E624D039B400010EAE /* ZJUpgradeAlertView.h */,
A9C2B8EE24D039B400010EAE /* ZJUpgradeAlertView.m */,
A9C2B8ED24D039B400010EAE /* ZJTableViewCell.h */,
A9C2B8E724D039B400010EAE /* ZJTableViewCell.m */,
);
path = View;
sourceTree = "<group>";
......@@ -1571,6 +1579,7 @@
A9C2B99E24D039B400010EAE /* launch1@2x.png in Resources */,
A9C2BA2124D039B500010EAE /* ZJGoodsStyle2CollectionHeaderView.xib in Resources */,
A9C2BA0824D039B500010EAE /* ZJLocationAttentionView.xib in Resources */,
A96793A024D1C46E00B6C5FA /* ZJSystemMessageCell.xib in Resources */,
A9C2BA1E24D039B500010EAE /* ZJGoodsStyle2Cell.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -1690,6 +1699,7 @@
BF3A68CE24D162B000977895 /* QFTimePickerView.m in Sources */,
BF3A68DA24D16D3700977895 /* ZJChooseIconCell.m in Sources */,
A9C2BA0524D039B500010EAE /* ZJUpdateNickNameView.m in Sources */,
A967939F24D1C46E00B6C5FA /* ZJSystemMessageCell.m in Sources */,
A9C2B9F424D039B500010EAE /* ZJFriendListTableViewCell.m in Sources */,
A9C2B9E924D039B500010EAE /* ZJAlertView.swift in Sources */,
A9C2BA1F24D039B500010EAE /* ZJGoodsStyle2Cell.m in Sources */,
......@@ -1715,7 +1725,6 @@
A9C2B9A624D039B400010EAE /* UIView+Category.m in Sources */,
BF3A68C624D15BB300977895 /* ZJReminderTimeController.m in Sources */,
A9C2B9C424D039B500010EAE /* Identifiable.swift in Sources */,
A9C2B9D724D039B500010EAE /* ZJXiaoXiViewController.m in Sources */,
BF3A68BE24D1565100977895 /* ZJReminderCareController.m in Sources */,
A9C2B9E624D039B500010EAE /* ZJLocationVC.swift in Sources */,
A9C2B9C624D039B500010EAE /* SJLabelSlider.m in Sources */,
......@@ -1795,6 +1804,7 @@
A9C2B9C224D039B500010EAE /* CollectionViewReusableViewType.swift in Sources */,
A9C2B9B624D039B500010EAE /* UILabel+FontAppearance.m in Sources */,
A9C2B9A424D039B400010EAE /* NSArray+Category.m in Sources */,
A967939B24D1AE7700B6C5FA /* ZJXiaoXiViewController.m in Sources */,
A9C2B9FB24D039B500010EAE /* ZJSettingViewController.m in Sources */,
A9C2BA2F24D039B500010EAE /* BaseModel.m in Sources */,
A9C2B9B724D039B500010EAE /* UIButton+Category.m in Sources */,
......
Dolphins/Classes/Care/Controller/ZJXiaoXiViewController.m
View file @ 4ef993ad
......@@ -18,7 +18,10 @@
@property (nonatomic, strong) ZJXiaoxiView *xiaoXiView;
@property (nonatomic, strong) NSMutableArray<ZJFriendMessageModel *> *dataArray;
@property (nonatomic, strong) NSMutableArray<ZJFriendMessageModel *> *systemDataArray;
@property (nonatomic, strong) NSMutableArray * currentDataArray;
@property (nonatomic, strong) ZJBasetableView *xiaoXiTableView;
@property (nonatomic, strong) UIView * lineView;
@end
......@@ -44,6 +47,7 @@ static NSString *ID = @"xiaoXi";
- (void)loadData{
self.dataArray = [NSMutableArray array];
self.systemDataArray = [NSMutableArray array];
[[TQNetworkTools shared] getWithAction:messageList parameters:@{} success:^(id _Nonnull response) {
......@@ -55,6 +59,28 @@ static NSString *ID = @"xiaoXi";
[model setValuesForKeysWithDictionary:dic];
[self.dataArray addObject:model];
}
self.currentDataArray = self.dataArray;
[self.xiaoXiTableView reloadData];
}else{
[MBProgressHUD showError:[response objectForKey:@"msg"] toView:self.view];
}
} failure:^(NSError * _Nonnull error) {
NSLog(@"getMessage_failure");
}];
[[TQNetworkTools shared] getWithAction:systemMessageList parameters:@{@"page":@"1", @"size":@"100"} success:^(id _Nonnull response) {
if([[response objectForKey:@"status"] integerValue] == 200){
for (NSDictionary * dic in response[@"result"][@"data"]) {
ZJFriendMessageModel * model = [[ZJFriendMessageModel alloc] init];
[model setValuesForKeysWithDictionary:dic];
[self.systemDataArray addObject:model];
}
[self.xiaoXiTableView reloadData];
......@@ -78,16 +104,69 @@ static NSString *ID = @"xiaoXi";
_xiaoXiTableView.tableFooterView = [UIView new];
[_xiaoXiTableView registerClass:[ZJXiaoXiTableViewCell class] forCellReuseIdentifier:ID];
[_xiaoXiTableView registerNib:[UINib nibWithNibName:@"ZJSystemMessageCell" bundle:nil] forCellReuseIdentifier:@"ZJSystemMessageCell"];
UIView * segmentBgView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 116*2, 44)];
NSArray *segmentedArray = [NSArray arrayWithObjects:@"好友申请", @"系统通知",nil];
UIButton * button;
for (int count = 0; count < 2; count++) {
UIButton * btn = [[UIButton alloc] initWithFrame:CGRectMake(0+count*116, 6, 116, 30)];
// [btn setTitle:segmentedArray[count] forState:(UIControlStateNormal)];
// [btn setTitleColor:kColorWithRGB(34, 34, 34) forState:UIControlStateNormal];
[btn addTarget:self action:@selector(headerBtnClick:) forControlEvents:(UIControlEventTouchUpInside)];
btn.tag = 0x64+count;
[segmentBgView addSubview:btn];
button = btn;
UILabel * lab = [[UILabel alloc] init];
lab.text = segmentedArray[count];
lab.textColor = kColorWithRGB(34, 34, 34);
lab.font = [UIFont systemFontOfSize:19];
[btn addSubview:lab];
[lab sizeToFit];
lab.center = CGPointMake(btn.frame.size.width/2, btn.frame.size.height/2);
UIView * point = [[UIView alloc] initWithFrame:CGRectMake(CGRectGetMaxX(lab.frame), lab.frame.origin.y, 6, 6)];
point.backgroundColor = [UIColor redColor];
point.layer.cornerRadius = 6/2;
[btn addSubview:point];
point.tag = 0xc8+count;
point.hidden = YES;
}
_lineView = [[UIView alloc] initWithFrame:CGRectMake(segmentBgView.frame.size.width/8, CGRectGetMaxY(button.frame), segmentBgView.frame.size.width/4, 2)];
_lineView.backgroundColor = kColorWithRGB(89, 144, 255);
[segmentBgView addSubview:_lineView];
[self.navigationItem setTitleView:segmentBgView];
}
- (void)headerBtnClick:(UIButton *)sender{
[UIView animateWithDuration:0.33 animations:^{
self.lineView.frame = CGRectMake(CGRectGetMinX(sender.frame)+sender.frame.size.width/4, CGRectGetMaxY(sender.frame), sender.frame.size.width/2, 2);
}];
UIView * point = [sender viewWithTag:sender.tag+0x64];
point.hidden = YES;
if (sender.tag - 0x64 == 0) {
_currentDataArray = self.dataArray;
}else{
_currentDataArray = self.systemDataArray;
}
[self.xiaoXiTableView reloadData];
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
return self.dataArray.count;
return self.currentDataArray.count;
}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
ZJXiaoXiTableViewCell *xiaoXiCell = [tableView dequeueReusableCellWithIdentifier:ID forIndexPath:indexPath];
xiaoXiCell.model = self.dataArray[indexPath.row];
xiaoXiCell.model = self.currentDataArray[indexPath.row];
xiaoXiCell.buttonClick = ^{
self.xiaoXiView = [[ZJXiaoxiView alloc] init];
[self.xiaoXiView showToWindow];
......
Dolphins/Classes/Care/View/ZJSystemMessageCell.h 0 → 100644
View file @ 4ef993ad
//
// ZJSystemMessageCell.h
// Dolphins
//
// Created by 明津李 on 2020/7/29.
// Copyright © 2020 Company. All rights reserved.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface ZJSystemMessageCell : UITableViewCell
@property (nonatomic, weak) IBOutlet UIImageView * headerImV;
@property (nonatomic, weak) IBOutlet UILabel * titleLab;
@property (nonatomic, weak) IBOutlet UILabel * desLab;
@property (nonatomic, weak) IBOutlet UILabel * timeLab;
@end
NS_ASSUME_NONNULL_END
Dolphins/Classes/Care/View/ZJSystemMessageCell.m 0 → 100644
View file @ 4ef993ad
//
// ZJSystemMessageCell.m
// Dolphins
//
// Created by 明津李 on 2020/7/29.
// Copyright © 2020 Company. All rights reserved.
//
#import "ZJSystemMessageCell.h"
@implementation ZJSystemMessageCell
- (void)awakeFromNib {
[super awakeFromNib];
// Initialization code
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
// Configure the view for the selected state
}
@end
Dolphins/Classes/Care/View/ZJSystemMessageCell.xib 0 → 100644
View file @ 4ef993ad
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="ZJSystemMessageCell" rowHeight="96" id="KGk-i7-Jjw" customClass="ZJSystemMessageCell">
<rect key="frame" x="0.0" y="0.0" width="439" height="96"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
<rect key="frame" x="0.0" y="0.0" width="439" height="96"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="guard_header_bg" translatesAutoresizingMaskIntoConstraints="NO" id="byG-0f-u04">
<rect key="frame" x="0.0" y="0.0" width="439" height="96"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2W8-wF-BpV">
<rect key="frame" x="150.5" y="26.5" width="28.5" height="13.5"/>
<fontDescription key="fontDescription" type="system" pointSize="11"/>
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="7fe-sx-T9z">
<rect key="frame" x="24" y="23.5" width="49" height="49"/>
<constraints>
<constraint firstAttribute="width" secondItem="7fe-sx-T9z" secondAttribute="height" id="hng-U1-I9R"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ebn-gG-5ti">
<rect key="frame" x="87" y="23.5" width="39.5" height="19.5"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" red="0.1333333333" green="0.1333333333" blue="0.1333333333" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zv6-BE-p0u">
<rect key="frame" x="87" y="56.5" width="33" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="0.40392156862745099" green="0.40392156862745099" blue="0.40392156862745099" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="time" translatesAutoresizingMaskIntoConstraints="NO" id="2gA-eb-Lqq">
<rect key="frame" x="138.5" y="29" width="8" height="8"/>
</imageView>
</subviews>
<constraints>
<constraint firstItem="2W8-wF-BpV" firstAttribute="leading" secondItem="2gA-eb-Lqq" secondAttribute="trailing" constant="4" id="3D7-bv-Llc"/>
<constraint firstItem="zv6-BE-p0u" firstAttribute="leading" secondItem="ebn-gG-5ti" secondAttribute="leading" id="5Na-ko-7D9"/>
<constraint firstItem="2gA-eb-Lqq" firstAttribute="leading" secondItem="ebn-gG-5ti" secondAttribute="trailing" constant="12" id="6PM-tF-sZu"/>
<constraint firstItem="ebn-gG-5ti" firstAttribute="leading" secondItem="7fe-sx-T9z" secondAttribute="trailing" constant="14" id="Eme-fU-GGP"/>
<constraint firstItem="7fe-sx-T9z" firstAttribute="width" secondItem="H2p-sc-9uM" secondAttribute="width" multiplier="42:375" id="RhU-T4-d7R"/>
<constraint firstItem="byG-0f-u04" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="Rzv-rm-imh"/>
<constraint firstItem="2gA-eb-Lqq" firstAttribute="centerY" secondItem="ebn-gG-5ti" secondAttribute="centerY" id="Ski-mF-eCA"/>
<constraint firstItem="7fe-sx-T9z" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="24" id="XQh-Ve-rV3"/>
<constraint firstAttribute="bottom" secondItem="byG-0f-u04" secondAttribute="bottom" id="YbA-z0-xe5"/>
<constraint firstItem="zv6-BE-p0u" firstAttribute="bottom" secondItem="7fe-sx-T9z" secondAttribute="bottom" id="YeB-om-HO4"/>
<constraint firstItem="byG-0f-u04" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="pLd-1Q-q2z"/>
<constraint firstItem="ebn-gG-5ti" firstAttribute="top" secondItem="7fe-sx-T9z" secondAttribute="top" id="qDk-jW-FYf"/>
<constraint firstItem="7fe-sx-T9z" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="tNQ-IE-lSZ"/>
<constraint firstAttribute="trailing" secondItem="byG-0f-u04" secondAttribute="trailing" id="zVY-Cg-djt"/>
<constraint firstItem="2W8-wF-BpV" firstAttribute="centerY" secondItem="2gA-eb-Lqq" secondAttribute="centerY" id="zaZ-CW-2ar"/>
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
<connections>
<outlet property="desLab" destination="zv6-BE-p0u" id="MQr-kf-ABK"/>
<outlet property="headerImV" destination="7fe-sx-T9z" id="61g-oI-SjU"/>
<outlet property="timeLab" destination="2W8-wF-BpV" id="i7n-CE-SrN"/>
<outlet property="titleLab" destination="ebn-gG-5ti" id="Ccu-uU-XjW"/>
</connections>
<point key="canvasLocation" x="223.91304347826087" y="113.16964285714285"/>
</tableViewCell>
</objects>
<resources>
<image name="guard_header_bg" width="344.66665649414062" height="242.66667175292969"/>
<image name="time" width="8" height="8"/>
</resources>
</document>
Dolphins/Classes/LocationAttention/ZJLocationAttentionVC.swift
View file @ 4ef993ad
......@@ -68,14 +68,16 @@ class ZJLocationAttentionVC: BaseViewController {
self.locationTableView.delegate = self
self.locationTableView.dataSource = self
maskBgView.isHidden = currentFriendModel != nil
// maskBgView.isHidden = currentFriendModel != nil
maskBgView.isHidden = self.locationRemindDataSource.count != 0
addLongPres()
}
func updataUI(){
self.locationTableView.reloadData()
maskBgView.isHidden = currentFriendModel != nil
// maskBgView.isHidden = currentFriendModel != nil
maskBgView.isHidden = self.locationRemindDataSource.count != 0
if currentFriendModel != nil {
headView.phoneLabel.text = " "+currentFriendModel.phoneNo
......@@ -202,37 +204,6 @@ class ZJLocationAttentionVC: BaseViewController {
deleteImage.removeFromSuperview()
}
}
func getFriendList(){
self.headerFriendsDataSource = []
TQNetworkTools.shared().getWith(findFriendList, parameters: [:], success: { (result) in
let dict = result as! NSDictionary
if(dict["status"] as! NSInteger == 200){
let result = dict["result"] as! Dictionary<String, Any>
let data = result["data"] as! Array<Any>
for dic in data{
let model = ZJFriendModel.init()
model.setValuesForKeys(dic as! [String : Any])
self.headerFriendsDataSource?.append(model);
}
self.currentFriendModel = self.headerFriendsDataSource?.first
self.updataUI()
self.getSingleFriendLocationRemindList(self.currentFriendModel)
}else{
MBProgressHUD.showError(dict["msg"] as? String)
}
}) { (error) in
}
}
}
extension ZJLocationAttentionVC {
......@@ -367,6 +338,38 @@ extension ZJLocationAttentionVC {
return dict;
}
func getFriendList(){
self.headerFriendsDataSource = []
TQNetworkTools.shared().getWith(findFriendList, parameters: [:], success: { (result) in
let dict = result as! NSDictionary
if(dict["status"] as! NSInteger == 200){
let result = dict["result"] as! Dictionary<String, Any>
let data = result["data"] as! Array<Any>
for dic in data{
let model = ZJFriendModel.init()
model.setValuesForKeys(dic as! [String : Any])
self.headerFriendsDataSource?.append(model);
}
self.currentFriendModel = self.headerFriendsDataSource?.first
self.updataUI()
if self.currentFriendModel != nil {
self.getSingleFriendLocationRemindList(self.currentFriendModel)
}
}else{
MBProgressHUD.showError(dict["msg"] as? String)
}
}) { (error) in
}
}
}
extension ZJLocationAttentionVC: UIGestureRecognizerDelegate{
......
Dolphins/Classes/Tools/Network/TQNetworkTools.h
View file @ 4ef993ad
......@@ -23,6 +23,7 @@ typedef enum : NSUInteger {
refundRequestStatus, // 查询退款申请状态
messageList, // 消息列表
systemMessageList, // 消息列表
reminderCopywriting, // 提醒文案
syncLocationDataList, // 查询轨迹
getLocationDataLast, // 获取最后一次位置信息
......
Dolphins/Classes/Tools/Network/TQNetworkTools.m
View file @ 4ef993ad
......@@ -288,6 +288,8 @@ static TQNetworkTools* _tools = nil;
return @"/app/v1/location/feedback/refund-request/status";
case messageList:
return @"/app/v1/location/message-list";
case systemMessageList:
return @"/app/v1/location/remindRecord";
case reminderCopywriting:
return @"/app/v1/location/reminder-copywriting";
case syncLocationDataList:
......
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